tools/configure: Check if Glib is present only when building QEMU

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
[ ijc -- reran autogen.sh ]

diff --git a/tools/configure b/tools/configure
index 1cab8047041564567cb8ff32924b35b980aacb40..7131d63375af887a01ef02abae426a5f7b1f3b0c 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -7462,6 +7462,7 @@ fi
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -7575,6 +7576,8 @@ $as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 fi
+if test "x$qemu_xen" = "xy"; then :
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib" >&5
@@ -7667,6 +7670,8 @@ $as_echo "yes" >&6; }
 
 fi
 
+fi
+
 # Extract the first word of "wget", so it can be a program name with args.
 set dummy wget; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

diff --git a/tools/configure.ac b/tools/configure.ac
index 24fdfc3766d50e2a777d0fbbc9c766699a0cc61a..fd405c59049c6a9992a01e2a78ae41649ca19dfe 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -323,7 +323,11 @@ i[[3456]]86|x86_64)
 esac
  AX_CHECK_UUID
  AX_CHECK_CURSES
+
+dnl Glib 2.0 is only required when QEMU is built
+AS_IF([test "x$qemu_xen" = "xy"], [
 PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12])
+])
 AX_CHECK_FETCHER
 
 # Checks for libraries.